See two latest commits in my Master.

They remove the SoftSuspend stuff from Interface and Sinks.