Removed unnecessary functions. Proceeding to refactor.