cleaning up more radically