cleaning out some cruft