server ok through trustme, and remove out of date TODO