Cleaned out some mess

Some incorrect code was commented out, it has now been removed for
clarity's sake.