DDF-670 - cleaned up base on per review comments.  Removed commented js/template code and cleaned up some java coding.