cleanup cruft files, narrow scope a bit