fix #1: clean unused code