Make sure we use optimized headers were possible and removed unused class