Removed ServerInputListener
Some refactoring