Draw 4 removal

I am now focusing on the issues involving Draw 4 on a separate branch.