Removed some dead code from refactor