Cleanup

- unused #define macros removed
- unused class templates removed
- unused #include-s removed