- Removed uneeded macros
- Updated some copyright header comment