Fixed enum conversion warnings
Removed unused method
Fixed enum conversion warning