Remove excess instance-variable setting