[MODIFY] remove unnecessary code
[MODIFY] change shortener