Cleanup of oncws library