More constant clean-up.