Got rid of unnecessary files and code