cleanup
Some first commits before I realized it probably won't work.