#405: remove unnecessary code