Cleanup, template work.