Removed references to .OptionalPackageDescription
Removed all references to LIBDIR