cleanup attr/class interp code