Bumping speed up a little

Also removing some debugging cruft