KFSQA-596 Removed extra step, code cleanup