remove some types from being imported; reorganize the options to be in alpha order