Start to cleanup Capabilities object spec.

Still not finished yet though!