Removed obsolete portability fixes