Some internal storage cleanup