Small optimization, and removed some unused files that were commented out in KOR anyway
Merge remote-tracking branch 'remotes/origin/master'