Removed async serialisation stuff