cleaned up ifndefs