Map class cleaning