Remove old bootstrap code