Removing TODO for bootstrapping release