Removed another demo block.
Remove extras define.