Clean up with regards to templates