Fixed bug with KVC cleanup.