Removed more :erlang.now calls