Cleanup of Grid view after branch merging