Bootstrapper: Removed cruft.