Fixed some sonar issues
Removed unused enumeration