more clean up

new template still constructing