issue-13 clean-up and remove skills lib