Remove legacy (refactored) code