remove some cruft code