Web DDS related code clean up