Chore/remove all amt occurances

@mrgordon these commits clear up the rest of the "amt" issues. cc: @arvel