Clean up old/dead code.