More docs/setup clean up