ahammett: cleaning up