It's about time. Now lets clean up the storage as well.