Removed TODO because remove protocol is not enough