Tweaks: Removing unused header includes and return value.
Merge branch 'devel' of github.com:/dmorse/simpatico into devel