Removed CoreServer due to refactoring.