shrink some functions, target to smaller and simple jar only. prepare for 2.0