Remove old wrapper class, we no longer use it