cleanup, more bootstrap integration