remove dead code
a workaround commit (not workable!!)