clean up a few .do to .mvc conversions