Removing files for Carl; fix for PHP-612
Ignoring conflict as file will re-render
Fix for PHP-612