Tidying up old stuff and deleted stuff
Done