5.0.5 cleanup 2

Massive cleanup of everything Minechem, brought to you by Maxwolf