remove some goto code
remove the repeat include files