Fix bootstrap and remove work stuff