Cleanup servlets code