started cleaning up templates