Extension pointers cleanup