more picking clean up