Remove unused vars
Simplify the case for fill renderer only
Bring back the conditional case