Cleaned up server code:
 * removed unused function
 * Stopped using built-ins as variable names