got rid of unnecessary headers