Cleaning out some cruft.