php5 upgrade, housecleaning