Remove unneeded drawing logic