removing some cruft