Remove misc methods complexity and duplications.