Added activity tracking and removed old unused MVC classes