Remove small way function
Add work around to way queue problems

The way queue seemed to be stalling, unsure why, as it is very similar
to the node queue. This change works around the issue.