Switched to bootstrap, implemented library cleanups