rejig string handling
remove unused constants