removed static map