Update normalize, removing unneeded declarations