Added removeAssignment and removeSelf methods in preparation for
deletion