More kifshare cleanup.