Removed GSM & MEC from Wasp constructor