server code clean up
server file clean ups