Remove older code with assign statement