draw: added missing class; changed func signature; unused dependencies