Clean up some comments and remove some stackato specific api calls.