Remove ifdef'd out members