Heh, should have known I wouldn't catch all the dead stuff I left laying about.  Can't even remember why I put it in there, probably should start either keeping better notes or rolling back to previous commits more often.

Both instances removed.