Removed superfluous code
Removed superfluous files
More removal of superfluous files