Cleanup pear package provider to better cope with state parameter