Multiple changes

Deleted Items that we didn't need as they are different types of draws
and we agreed on doing the Paint Thread version.