Remove advanced control for now