[#909] Further cleanup