improve performance; clean up server