Re: [PATCH 7/9] delete ifdefed and unused code