Removed two functions