Data cleanup method

Making id predicated have consistent object types