Remove unused
Extract Draw behavior

Fixed some bugs but introduced others.