removing more depricated code