remove mapping collection stuff