added removal of assignment