remove old hacks needed by older versions of rust
remove old hacks needed by older versions of rust