* Remove deprecated macros and typenames.