Clean up dead code from refactor