- Cosmetics
- Removed unused macro
- Removed unused terminal symbols