remove extra func