Moved enumeration of cells into its own function
Only remove debug overlays