removed old server core file
a bit of refactoring