clean up of some unused crud