Sanity check, cleanup