Remove old const to avoid warning