Remove unnecessary assignations