Moving remove_*.php files and fixing reference errors.
Fixing reference errors.