Remove map clustering for now