Cleanup and change kit to wishlist