Remove NAS Gateway HACK