removing all the generic typing as it wasn't really necessary