Remove finalizeInputMap, it is not needed anymore (I hope)