refactored controllers and removed demo