[#104] Remove some useless code