Removing @@rolodex references