Minor tweaks and removing unneeded files.