VID-2044 code cleanup and adding bucky calls