Remove wake options from the correct category + remove category itself if no children present

Change-Id: Iebd4f4f2551db6b4244eb8eff9f958a8646a72fd