Remove unused code (Boy Scout Rule)
File cleanup (Boy Scout Rule)
Remove Syntax Warnings (Boy Scout Rule)