removed a few list_t's