cleanup + fix against template duplicated inlines?!