Remove GoTo nonsense