Cleanup and more checks