Fixes #581. Document cleanup conventions