web service changes and cleanup