Revert 6ddf5f8..3f8935d

This rolls back to commit 6ddf5f86e75233d18b6ae157874f227c8209f32b.
Cleanup

Deleted many unnecessary files