Some cleanup; disabled currently unavailable export options.