Removed unnecessary code that is no longer need because of refactoring