#455 remove more hard coded strings