Remove disabled self-join processing