Cleanup for ETTO presentation