These changes should not push to upstream
Revert "removed some metadata dependencies we don't use locally which cause"

This reverts commit 9be970b249dd208c4441c6fac54196a0dede9645.
Changes based on foodcritic test results
One more foodcritic update
More foodcritic syntax updates
Additioinal foodcritic updates