Change to better template enginge. Cleanup.