Removing unused types