removed old draw code