remove remainders

Change-Id: Ib07cdf5a4417ce8bbb1dac8fcd9a84e71a6aa2b0