Remove old provider code
Try to increase speed. Update min SDK version