Some cleanups done
(#590)