Several references to old package concept removed.
UUID removed from code.