Remove non-portable code