Code formatting fixes.
Removed old classes from the CMakeLists.txt
Merge pull request #1335 from mc-server/CodeFixes

Code formatting fixes.