fix everything, remove branches