Removed the older server logic