cleanup bootstrap code