Refactored and added more release groups to remove