Sanity check cleanups