Toxic cleanup (Lord have mercy!)

Things are getting a little out of hand now. Managed to clean up this
project ONCE AGAIN!