MAC system clean-up