Changes to salmon for myinboxisnotatv, rough cleaning

Signed-off-by: enyst <engel.nyst@gmail.com>