Removing legacy bootstrap code