Remove duplication in Assignments