Local server code cleanup