Working on controller and cleaning database