Removed Savant3 to a simpler Template System