#178 rework commit 5997264
#178 rework commit 669a74d
#178 remove unused method