Removed old model and controller