Removed WPS-RPG calls to use native calls