Revert "Change fill rect to clear rect"

This reverts commit 88e6a9a2f26b1b6da612eeec6d87364b0144c402.