Trying this code removal change again with latest main merged in