Remove file from package.skeleton
Tweak dependencies spec
Add safer helper function