Remove snippets of code
Small changes in controller