diff --git a/taglib/wavpack/wavpackproperties.cpp b/taglib/wavpack/wavpackproperties.cpp
index 73d914dc..9ddabe1e 100644
--- a/taglib/wavpack/wavpackproperties.cpp
+++ b/taglib/wavpack/wavpackproperties.cpp
@@ -38,7 +38,7 @@ using namespace TagLib;
 class WavPack::Properties::PropertiesPrivate
 {
 public:
-  PropertiesPrivate(const ByteVector &d, offset_t length, ReadStyle s) :
+  PropertiesPrivate(const ByteVector &d, offset_t length, ReadStyle s, File *f) :
     data(d),
     streamLength(length),
     style(s),
@@ -49,7 +49,7 @@ public:
     version(0),
     bitsPerSample(0),
     sampleFrames(0),
-    file(0) {}
+    file(f) {}
 
   ByteVector data;
   offset_t streamLength;
@@ -68,17 +68,10 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-WavPack::Properties::Properties(const ByteVector &data, offset_t streamLength, ReadStyle style) : AudioProperties(style)
-{
-  d = new PropertiesPrivate(data, streamLength, style);
-  read();
-}
-
 WavPack::Properties::Properties(File *file, offset_t streamLength, ReadStyle style) : AudioProperties(style)
 {
   ByteVector data = file->readBlock(32);
-  d = new PropertiesPrivate(data, streamLength, style);
-  d->file = file;
+  d = new PropertiesPrivate(data, streamLength, style, file);
   read();
 }
 
@@ -160,7 +153,7 @@ void WavPack::Properties::read()
 
   unsigned int samples = d->data.mid(12, 4).toUInt(false);
   if(samples == ~0u) {
-    if(d->file && d->style != Fast) {
+    if(d->style != Fast) {
       samples = seekFinalIndex();
     }
     else {
diff --git a/taglib/wavpack/wavpackproperties.h b/taglib/wavpack/wavpackproperties.h
index 0766b422..2c51d0cb 100644
--- a/taglib/wavpack/wavpackproperties.h
+++ b/taglib/wavpack/wavpackproperties.h
@@ -51,19 +51,9 @@ namespace TagLib {
     class TAGLIB_EXPORT Properties : public AudioProperties
     {
     public:
-      /*!
-       * Create an instance of WavPack::Properties with the data read from the
-       * ByteVector \a data.
-       *
-       * \deprecated This constructor will be dropped in favor of the one below
-       * in a future version.
-       */
-      Properties(const ByteVector &data, offset_t streamLength, ReadStyle style = Average);
-
       /*!
        * Create an instance of WavPack::Properties.
        */
-      // BIC: merge with the above constructor
       Properties(File *file, offset_t streamLength, ReadStyle style = Average);
 
       /*!