Update to DS 0.5
Cleanup