clean out some working code