Removed obsolete variables, and fixed memory allocation bug in InfrastructureCalibration class.