Rest of sanity check cleanup