Added public declaration. Cleaning of unused predicates.