[#73] Remove name dropping