Remove old code superseded by refactored version