massive cleanup in bootstrap