Cleanup some debugging and make setup handle partial configs in bootstrap