remove dependencies to old code