Removed unused Headers and methods