remove old functions and CLBMapper class