[fix] remove dependency to amatch