Bugzilla cleanup