cleaning up header and removing unnecessary options