remove Duplicate code
delete unused code