PINY cleanup and new feature integration.