OutputManager tuning and clean up