-Remove ifdef'd out code