Removed some extraneous headers