Cleanup dead code