added assign cleanup