Remove last piece of Agate from commercial components v2