Added removal of delimiters