Removing old code after refactor.