#1: more aggressive cleanup.