cleanup - less php/non-php switching