Removed depricated functions