Cleaning up some more unused files