removed contentious things