cleanup
pull out bootstrap_context, add spec