Clean up dead code after recent refactor