Faster bootstrap (less stuff to get off the net)
Further namespace cleansing