removed files we are no longer using, and tidied up a bit