remove substring? function - reduce maintenance