Removed any trace of fieldid on api