VID-2044 code cleanup. Decided not to add bucky calls to this file