fix and also convert php52s in cleanup