Removing some unneeded files and other small changes