Debugger: Further cleanup

Change-Id: I9c744202efe3af56f60fe5f09358d9b39e0eaafe
Reviewed-by: hjk <hjk121@nokiamail.com>