Added serialization and calibrationEngine cleaning