Removing some cruft from the first light program