Remove unless defined? - it's not needed here