Cleans up from merge