Fixed crash on player quene remove
Also small code cleanup