remove things i don't use and tidy up a bit