Removing legacy headers