Remove unecessary model and controller staff