Delete old .php files.
Merge branch 'master' into production