cleanup some cruft