Cut out redundent server code