Update to DS 0.4 and cleanup poms