8/20/13 - Another commit removing some cruft

Another commit removing some cruft from transition to Object Oriented
design