Cleaning a few things up, and getting rid of unused files