Remove use of id()