typedef cleanup