Remove configs from mc app and merge in upstream changes to that app