[#BKDCORE-195] - Removed unused code and refactored controllers to app code