remove old ws code