Minor cleanup, correct comments
Cleanup warnings
Remove the obsolete locale field