remove the unused options
remove unused headers