this cleanup indicates its time to kill this package and move stuff into other packages