Simplified queue interface. Removed useless logic