qw deprecation fix and a solved todo
add a pseudo private helper function: _empty_storage