cleanup: remove no longer needed code