Remove non-ported code