Change all delete method to return self instead of nil

Change-Id: If1ff321d1cd961c9590e584b452a1754af16160a