Clean up checks for visibility and store spaces to .