Clean deprecation
Systray support