rm unnecessary code related to issue #27