Removing global variable definitions in search for CPP binding.
Basic tests successful.