clean up, plus use normal add and remove layer of clusterer