Merge commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5' * commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5': Cleanup of unused enums
Merge commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5' * commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5': Cleanup of unused enums