make it work a bit better
remove lib moved to utils