Removal of unneccessary files
More removal and small modification to keep it all working