Fixes and removal of old php parser