Remove temporary option for live use