Remove the rest of the struct silliness