Get rid of redundant initialization code