Removing useless code & Checking draw very fast