remove useless classes, improve storage providers