Removed bootstrap cruft