remove old cruft code