Revert "[UNSTABLE] Composed Datapoints (fixing some problems)"

This reverts commit 9a4e1f0e3c8896f39347782c91f8813a4ffe1385.