Eluna some clean only for tbc

Signed-off-by: Salja <salja8840@gmail.com>