Removing some php to simplify code
test 2
Merge branch 'tb-conversiontracking' into staging