Work on cleaning up resoure IDs associated with refacotred code.