Cleaned out templates