CON-1447: Removed unused vars