Delete some code fragments and fixed minor issue #53, #52

Signed-off-by: Sven Haardiek <Sven@Haardiek.de>