Clean up after implementing tempale code