Revert "clean ups to wipe_metadata "

This reverts commit 07ab7522c4e33b394fc1c987729c7a6e3705e67a.

It was mistakenly done in the master instead of the relevant branch