fixes made to control regarding comparing lower case/upper case strings

removal of unused code from tokeniser