Remove volatile keywords