Revert 2e751ab..e8a5967

This rolls back to commit 2e751ab3b45d7be30f104a0945362605dc3979cb.
Revert e8a5967..f5010a2

This rolls back to commit e8a59675fbf4f4f27338ebe41d7a8d651d52c827.
Code has been cleaned in controllers

Just applying some stuff from last class.