refactoring
remove code
change interface name