Clone
Christian Schneider
committed
on 06 Jul 16
Some more cleanups