[IMP]: refactor code to remove unused codes
[IMP]: refactor code to remove unused codes