Clean old references & package update