cleaning and build fix