I agree, get rid of the cruft