Move init of sinks into separate functions.

Also removed unused include.