BE - Class and Abilities clean up