Remove some unneeded files and make some updates