cleaning (refs: #590)