Cleaning up template...