Switch to using apache StringUtils