Code cleanup in server 1