fix adapter scoping, remove draw where unneeded