more clean up on extensions