Clean up and removed db for header and localized code