AM: rm unused variables, use only