gustafn
committed
on 16 Jul 18
simplyfy expressions, remove useless file