FW-312 some more ringmaster cleanup