Clean up some old code. 
12 files changed