Keep it simple, bunch of controllers deleted, for keeping order in which one we are working