Remove leftover value object
Add more commands