Remove server core abstraction