remove andmap from public API (we still have and-map)