removed unused argument
removed lock
cleanup