remove and fix