#1153: Cleanup