Minor tweaks and removed extra files.