Cleaning up foreign relationships