Removed depricated code