Removed some port-related options for more usable results