Remove bionic directory dependance