remove WITH DIVISION clause

Change-Id: I986fe56a8559f88f2781adf700933d5b03c9e697
Merge "remove WITH DIVISION clause"