cleanup [KFSQA-740]