Fix some ifdefs and remove commented code in muon packages

Hi,

this MRs fixes some ifdefs in MuonReadoutGeometry and removes commented code in muon packages.

Best, Nico