[KFSQA-839] Cleaned up some stuff.