Remove 5.4 support
Remove x from php files