Massive cleanup for RESTservice, removing old commented out code.