Changes in cleanup stage to be more generic, instead of using velvet prefix