removed a few redundant drawing calls