Removed all GS and Nirvanix references