remove unnecessary code, fix minor bug
Remove unused code
clean up code
Reduce complication with similar strategy