removed all prev draw refs