[Pending review] Remove arrows