Even more crap

Just look at the diffs if you care.