editor functional tests: Clean out unneeded waits and variables