catbox 4.1. Closes #2098
Clarify file clean. Closes #1715