remove some unessential codes