KT Prototype cleaning up