Cleaned up more unused files