REFACTORING: removed misc code fragments due to harmonization of vocab and mapping partioners