[KFSQA-1011] cleaned up