cleaned up kvc replacement