Merge "Remove secgroups related methods"