cleaned up useless models and controllers