remove unnecessary lookup
use substring instead of remove