Revert "Revert "Removing unused file""

This reverts commit 6556bce360dfb9b2f48b88ae1d9e17674a81f29c.
Revert "Temporarily moving files depended on by external projects back"

This reverts commit 11a225bc2de1eedb8073cfe427179d76514e9fb4.