Part of a cleanup. Removing unused files