Removed depricated implementation