clean up server models and controllers