Removed redundant drawing code