Refact controllers, clean unused code and clean dublicate code