removing stuff
stuff in wronge places
erm....