home wip, bootstrap removal