removed depricated code