Remove incremental number, not required
Cleanup unused code
Use submit, deals with queuefull
update