remove and fix stuff