Revert draft bootstrap code
Remove debug statements