Capabilities cleanup