Revert to  8663a4d71d93c503521e2d40afb40c1ac8b8076e
Removing unused files