Got rid of some of the commented out example code - can restore using VCS if we need it back