Clone
Gintas Grigelionis
committed
on 27 May 17
More code cleanup