remove AMSA specific references