rm dead code in draw