remove unneeded code for theming and templating