11/19/14 2

* More cleanup