Removed several unnecessary controllers and code and fixed a bug