Fix simple theme <header> issue and remove a useless function