Several style tweaks, and removal of unneeded files.