Remove pre-map implementation