Remove || nil since instance variables default to nil if unset
Remove unused variable