#189, cleanup sharing section