cleanup of dead code