Remove old portability cruft