Cleanup of compile warnings. Remove multiple entries in content bundle. Use constant for filenames.