Cleaning up extension