extension removal fixes