Remove character that sneaked in (wrong window)
Remove static calls.
Minor cleanup