removed references to window