remove unused code
clean up old templates