Some more cleanup of javascript includes