(BB10) Take out some ifdefs for BB10