Remove use of the ID field