Notify if queue is empty
Remove contruct call
Remove construct call