Remove an assload of IFDEF and IFNDEF