Cleanup restruct lib.sh 1.4