Remove the need for config header