removing explicit goto actions