Temporary Mandrill bits.
Clean up some commented out cruft.