Removed unused header and cpp