Cleanup and DetectorConstruction