Sanity cleanup