Disable self-join processing, test using clear instead
Make property clearing a bit more rigorous