Issue #42 - Remove storage objects. :-(