Remove some unnecessary includes
js/css fixup