Rework skills database keys, remove bootstrap local lib.