Removed looping through each object property in each method of _X