removed useless stuff from controllers
refactored after testing