Remove current server implementation

- remove current method, to make way for new approach