[#933] Cleanup more code