Extension Cleanup
minor 201318 upgrade