Cleanup & Html tags remover methods updated