address code review comments 02
add missing file
remove and sort using
remove unused code