removing rich markers, updating clustering code