bug1019528 - cleanup