Clean-up and comment server files