Adding in recent changes
some cleanup
more cleanup
more cleanup
Removing several files
further cleanup