removed functions used in conflict testing