Finalization for Kit

Commented and deleted any unnecessary code