Removed more references to Resources