Fixed Lint Issues, Removed unused code/files
Merge branch 'kageiit-lint'