Lunchtime Cleanup of old files
More cleanup
Clean up, fix specs, and pass some of them