Remove custom header file & function
Remove unused code & update the theme info