Some storage cleanup