[#909] Further cleanup

@kardan or @KasperBrandt check please. and let;s close that branch