Remove ordering conflict
Fix delete allowing for multiple groups at the same location