Much more cleanup

boy, there were a lot of unused files in here.