Clear branch
Further cleanup