Cleanup some unused files and warnings