Remove duplicated and deprecated code
Refactor ability class