Remove unnecessary logic - thanks @pornel