Remove deprecated macros. builds on 3.1x