Cleanup of some unused files