more triggered cleanup of unused/dead code