Remove custom logic that resulted from bad FK references