WSSQL-3 Cleanup
Signed-off-by: rpastrana <rodrigo.pastrana@lexisnexis.com>