Unneeded lock & on-demand initialization removed