refactoring remove no use code