WS Fixes

Added missing delete method, and general housekeeping. Fixed an
embarrassing compile error