A whole bunch of broken shit!
Bit of code clean-up.