Removed use of deprecated macro