Removed d2vzw as it is now in official gummy

cleaned up manifest
added back grouper