Remove dangling generateSurface method
Fix localization
Rename/cleanup event handlers