Server side code cleanup.