Remove unused code

Code was not commented out, just unused.
Implement '?' - optional element
Implement '+' - repeat element one or more time