Did some work on reviewing ifdef's

Removed a bunch of functions that weren't really being used.
They are useful but I'm trying to simplify things, and they
are complicated and not very intuitive.
Added a todo item.