cleanup patch by david