Clean up for other platforms