Remove a few unused defines and structures