Sanity clean up