clean up some generic types