clean up and addtion of required webservice functions