Fixing error due to partial name
cleaning up unused parts of several controllers