More controller logic moved to models, deleted some unused files