Cleanup for watson