Unblock put in queue andd clean useless code