remove 'no-expand?' keyword as it is no longer needed