remove unneeded generic types