TONY: Remove dummy defines