Remove window vars in everything, closes #8