Code and style tidyup, removing old files