Removing loop based manual control