added ooor_public_model method; cleanup