Commented code and removed unneeded controller