Cleaned *Id references.
Prep work for EF.