optimise imports of AM and client packages