Removing hard bootstrap dependency