Remove support code for bootstrap