Removed functionalities that became unrequired after refactoring