Tb kit clean

This is a clean(er) branch of kit module. Please let me know if this is not correct (still not terribly confident in my git skill ).