#1088 - cleaning up