remove code that was already refactored elsewhere