Documented a little and deleted unused stuff.
Commit after merge.