Clean up code mess created during move to Capabilities system in 2.0.0

Stormwind99 opened this issue 6 years ago · 1 comments