remove portability code for now