Deleted the macros and DEMO_BOARD