CLEANUP: use DEPRECATED macro