1001609-more-fkey - more clean up prior to creatingforeign keys