Get rid of 'should' syntax