Remove endpoint, and add mtu support