remove parts that are not used anymore
fixes after review input