Fixed pickall command and cleanup code.