Removed v6/v7 package handling now that framework is branched