Removed pointless #ifdefs
 Moved functions around in file in preparation for switch to newer API
Signed-off-by: NBen Warren <biggerbadderben@gmail.com>