Clean up, corrected 'invalid window token' error