Got rid of unneeded files and functions