Bug 25013: Remove aliases for keys as these are only for local end