Cleanup
- some cleanup
- enable localegen