This just removed some unneeded predefines. One needed a whole
function moved down further. The others could just be deleted.

No functional changes.
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>