cwm: fix select key, cleanup