Removed legacy code, made package cross-version compatible