Removed mode switching helpers