Clean up build warnings. Remove redundant files.
Merge pull request #2281 from metalivedev/cleanupformat

Clean up build warnings. Remove redundant files.