846: cleaning up