[enroute] Removed the gogo command to make it simpler
More cleanup … hope this is final