Removed some unneeded code, added a new utility function and moved to using boolean values in the config.h file.

There is a new FIXME though...