Contact delete + refactor