Remove pointless Value Objects
Update the docs