replace another reference to the legacy database
cleanup and fix fxcop issues
tweaks
tweaks
tidy up