Cleaned up unused code and deleted unused files.
Merge remote-tracking branch 'origin/master'