cleanup
 - dont use bundle messages in static files
 - @override