[#909] Further cleanup

@KasperBrandt check please