Added remove assignment functionality