Server side code cleanup