Remove dependency to bootstrap