Refactor - remove outdated functionality