Removed unneeded files and not used variables