Fixed issue #320 #314 - @Drew - this is the beginning of the cleanup...