removes unneccessary debugging code
resolves conflicts