- Cleaned up header files and unused methods