Clean up dead code