Clean up more ExternalInterface