clean up grid for new mask unmask methods