remove debugging output. also, we no loger use sa and ma types