fix comments, clean up remaining demoobject stuff
separate service and plan