Some cleanup of dead code