cleaned up usage of config, removed nullpointer checks, added missing
responses
Reverted to 5216ff9
Finished revert to last version before merge.