removing some cruft from previous versions