11/19/14 4

* Really last cleanup