fix build and eliminate uneccessary codes