Remove unused code
Add interface for address and port