remove some code fragments not used anymore
improved design