get rid of legacy and portability stuff