Removed old unused files
Reduced header dependencies