Merge "Remove static initializers"