VID-566 cleaning up params sent back and forth