cleanup + using new Hashcleaner instead of JsonCleaner