Uncommented Controller
Removed external mixin from controller
Removed unused property from controller