Added comments
Removing unused controllers
Fixing