removal of a lot of unwanted code :)
removal of a lot of unwanted stuff again