Fixes for Catkin.
Simplified extension removal code.