Clearing out some old stuff. @dhm @davezeitlin