Some clean up.
Some bootstrap clean up.