This patch removes the import lines not used
Add some spaces, remove lines,... now format is better (lintian).
No working tests yet. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>