Remove assignment
Fix nil assignment