Clean-up checks