more php cleanup