Removing env groups for now to simplify deploy