Taking out a little bit of junk. Might go back later to undo the stylesheet paths.
Fixing a merge conflict (again?)