Change the cleaning functions

Change-Id: I3a2e5104240fec6a8401e665a33ff9812631961c
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>