Minor code readability fix
Removed unfinished and wrong queue concept