[#650] Remove some dead code